Reinstate abstract types

diff --git a/ChangeLog b/ChangeLog
index 7e2c789163c80138250ecfda5302c863a4071068..315ff172d49466f39e2254062603c90fb5be38b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
 2006-05-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkseparator.c: 
+       * gtk/gtkscrollbar.c: 
+       * gtk/gtkpaned.c: 
+       * gtk/gtkoldeditable.c: 
+       * gtk/gtkmisc.c: 
+       * gtk/gtkitem.c: 
+       * gtk/gtkimcontext.c: 
        * gtk/gtkrange.c:
-       * gtk/gtkscale.c: GtkRange and GtkScale are supposed to be 
-       abstract types.
+       * gtk/gtkscale.c: Make types abstract again.
 
 2006-05-06  Matthias Clasen   <mclasen@redhat.com>
        

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7e2c789163c80138250ecfda5302c863a4071068..315ff172d49466f39e2254062603c90fb5be38b4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,8 +1,14 @@
 2006-05-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkseparator.c: 
+       * gtk/gtkscrollbar.c: 
+       * gtk/gtkpaned.c: 
+       * gtk/gtkoldeditable.c: 
+       * gtk/gtkmisc.c: 
+       * gtk/gtkitem.c: 
+       * gtk/gtkimcontext.c: 
        * gtk/gtkrange.c:
-       * gtk/gtkscale.c: GtkRange and GtkScale are supposed to be 
-       abstract types.
+       * gtk/gtkscale.c: Make types abstract again.
 
 2006-05-06  Matthias Clasen   <mclasen@redhat.com>
        

diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index f2d88497ccf49a8be36199731a24d187d43b4b7a..e8eadc33943e47ddd7a9b1fb6d1d537b7d9238c2 100644 (file)
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -51,7 +51,7 @@ static void     gtk_im_context_real_set_surrounding    (GtkIMContext   *context,
                                                        gint            len,
                                                        gint            cursor_index);
 
-G_DEFINE_TYPE (GtkIMContext, gtk_im_context, G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE (GtkIMContext, gtk_im_context, G_TYPE_OBJECT);
 
 static void
 gtk_im_context_class_init (GtkIMContextClass *klass)

diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c
index d15b42d15bef889c18b9d40770761b4be75b35c8..10fc731ead8d21156584073f9f6fd6e08119ca26 100644 (file)
--- a/gtk/gtkitem.c
+++ b/gtk/gtkitem.c
@@ -48,7 +48,7 @@ static gint gtk_item_leave      (GtkWidget        *widget,
 
 static guint item_signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (GtkItem, gtk_item, GTK_TYPE_BIN);
+G_DEFINE_ABSTRACT_TYPE (GtkItem, gtk_item, GTK_TYPE_BIN);
 
 static void
 gtk_item_class_init (GtkItemClass *class)

diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c
index 5089193cd9cbda1818561d24f4a9e43b0b7d86e7..a876d0b0239399719d5ca369cae61ca3d5503a16 100644 (file)
--- a/gtk/gtkmisc.c
+++ b/gtk/gtkmisc.c
@@ -51,7 +51,7 @@ static void gtk_misc_get_property (GObject         *object,
                                   GParamSpec      *pspec);
 
 
-G_DEFINE_TYPE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET);
+G_DEFINE_ABSTRACT_TYPE (GtkMisc, gtk_misc, GTK_TYPE_WIDGET);
 
 static void
 gtk_misc_class_init (GtkMiscClass *class)

diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c
index 81dd33a4991d73bde4205fb2085ff86060e29c94..562fbb122a7fcee7b0a50e71e470bb74e84fce03 100644 (file)
--- a/gtk/gtkoldeditable.c
+++ b/gtk/gtkoldeditable.c
@@ -128,9 +128,9 @@ static gint     gtk_old_editable_get_position        (GtkEditable *editable);
 
 static guint editable_signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE_WITH_CODE (GtkOldEditable, gtk_old_editable, GTK_TYPE_WIDGET,
-                        G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
-                                               gtk_old_editable_editable_init));
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkOldEditable, gtk_old_editable, GTK_TYPE_WIDGET,
+                                 G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
+                                                        gtk_old_editable_editable_init));
 
 static void
 gtk_old_editable_class_init (GtkOldEditableClass *class)

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 4690977b3c7d091212f28b9edcbb41966635de8f..5c5be945583352c4a9fa96ca1e9b1547d9f4ae2d 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -138,7 +138,7 @@ struct _GtkPanedPrivate
   guint32    grab_time;
 };
 
-G_DEFINE_TYPE (GtkPaned, gtk_paned, GTK_TYPE_CONTAINER);
+G_DEFINE_ABSTRACT_TYPE (GtkPaned, gtk_paned, GTK_TYPE_CONTAINER);
 
 static guint signals[LAST_SIGNAL] = { 0 };
 

diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 4165ab5f7d52796a2f3856d58b021c58bfbc7af6..04ac0d9ea0e29e38256f4e3910f7033e2479bd34 100644 (file)
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -34,7 +34,7 @@
 static void gtk_scrollbar_style_set  (GtkWidget         *widget,
                                       GtkStyle          *previous);
 
-G_DEFINE_TYPE (GtkScrollbar, gtk_scrollbar, GTK_TYPE_RANGE);
+G_DEFINE_ABSTRACT_TYPE (GtkScrollbar, gtk_scrollbar, GTK_TYPE_RANGE);
 
 static void
 gtk_scrollbar_class_init (GtkScrollbarClass *class)

diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index 5aa9d332fac76fd92f79aee1b9f234718f5807c2..9ee2b1b33377e3d0755657ce5d631076c47c72cb 100644 (file)
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -30,7 +30,7 @@
 #include "gtkalias.h"
 
 
-G_DEFINE_TYPE (GtkSeparator, gtk_separator, GTK_TYPE_WIDGET);
+G_DEFINE_ABSTRACT_TYPE (GtkSeparator, gtk_separator, GTK_TYPE_WIDGET);
 
 static void
 gtk_separator_class_init (GtkSeparatorClass *class)